Grammar change in the license declaration.

Many of the files say "use, duplication, or disclosure ARE subject
to..." but the common phrasing of this statement is apparently "use,
duplication, or disclosure IS subject to..."

We are already taking great delight in the fact that we are using the
GPL without using Stallman's preferred declaration of it.  And of course
we call it open source software.

When Steve Jobs died, Richard Stallman said "I'm not glad he's dead,
but I'm glad he's gone."  I agreed with him.  When Richard Stallman dies,
I will say "I'm not glad he's dead, but I'm glad he's gone."  But
when Bill Gates dies, I will be glad he's dead.  I will celebrate.

diff --git a/citadel/server/backends/common/database.c b/citadel/server/backends/common/database.c
index e9f2911b54fd6253aeb2880288bc2265c31f71a4..9ac8817eb732a08c8dcf8d68be7aa82307f2493c 100644 (file)
--- a/citadel/server/backends/common/database.c
+++ b/citadel/server/backends/common/database.c
@@ -1,6 +1,6 @@
 // Copyright (c) 1987-2023 by the citadel.org team
 // This program is open source software.  Use, duplication, or disclosure
-// are subject to the terms of the GNU General Public License, version 3.
+// is subject to the terms of the GNU General Public License, version 3.
 
 // The functions in this file handle the selection and activation of a storage backend for Citadel Server.
 // Right now, it simply activates Berkeley DB because that's the only one we have.

diff --git a/citadel/server/citadel_dirs.c b/citadel/server/citadel_dirs.c
index 7a7a6d5e69bbca18e33ae698535d1a95ab9ad90a..2ebb5d5dfcc1a5193230cc81815dd0bea584f9c3 100644 (file)
--- a/citadel/server/citadel_dirs.c
+++ b/citadel/server/citadel_dirs.c
@@ -3,7 +3,7 @@
 // Copyright (c) 1987-2024 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or disclosure
-// are subject to the terms of the GNU General Public License, version 3.
+// is subject to the terms of the GNU General Public License, version 3.
 
 #include <unistd.h>
 #include <stdio.h>

diff --git a/citadel/server/config.c b/citadel/server/config.c
index 7e0db5bb4a5ccc6bbb528bdeca91e584dfd76296..fa05c4dfd6f56e18a0e08fcf1bbde5a4e881cdb7 100644 (file)
--- a/citadel/server/config.c
+++ b/citadel/server/config.c
@@ -3,7 +3,7 @@
 // Copyright (c) 1987-2024 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or disclosure
-// are subject to the terms of the GNU General Public License, version 3.
+// is subject to the terms of the GNU General Public License, version 3.
 
 #include "sysdep.h"
 #include <stdlib.h>

diff --git a/citadel/server/config.h b/citadel/server/config.h
index cbe2548c92909688b058556f117175008d5421f4..db13fe43e8d83d3f43a5e90d36996910311db432 100644 (file)
--- a/citadel/server/config.h
+++ b/citadel/server/config.h
@@ -1,7 +1,7 @@
 // Copyright (c) 1987-2024 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or disclosure
-// are subject to the terms of the GNU General Public License version 3.
+// is subject to the terms of the GNU General Public License version 3.
 
 #include "serv_extensions.h"
 #include "citadel_dirs.h"

diff --git a/citadel/server/control.h b/citadel/server/control.h
index 3fa869fc87201f9315d1004d2af8613731e45456..11dd19319b1f89b0f81db202fadfbc0035a53d95 100644 (file)
--- a/citadel/server/control.h
+++ b/citadel/server/control.h
@@ -1,7 +1,7 @@
 // Copyright (c) 1987-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or disclosure
-// are subject to the terms of the GNU General Public License version 3.
+// is subject to the terms of the GNU General Public License version 3.
 
 void get_control (void);
 void put_control (void);

diff --git a/citadel/server/database.h b/citadel/server/database.h
index a83211d39c33252ae060bef7b1ff66d3632fb39f..d7f9771ef494ee38b779f1070bb074eb2d11704a 100644 (file)
--- a/citadel/server/database.h
+++ b/citadel/server/database.h
@@ -1,6 +1,6 @@
 // Copyright (c) 1987-2023 by the citadel.org team
 // This program is open source software.  Use, duplication, or disclosure
-// are subject to the terms of the GNU General Public License, version 3.
+// is subject to the terms of the GNU General Public License, version 3.
 
 // These functions comprise an interface between Citadel Server and a database backend.
 

diff --git a/citadel/server/default_timezone.c b/citadel/server/default_timezone.c
index 51e0c8e29a1f04741892c08091523654b0c5d4ec..e8ffe6924b453399af60ae305da0a47235340066 100644 (file)
--- a/citadel/server/default_timezone.c
+++ b/citadel/server/default_timezone.c
@@ -2,7 +2,7 @@
 // Copyright (c) 1987-2024 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or disclosure
-// are subject to the terms of the GNU General Public License, version 3.
+// is subject to the terms of the GNU General Public License, version 3.
 
 #include "sysdep.h"
 #include <stdlib.h>

diff --git a/citadel/server/makeuserkey.c b/citadel/server/makeuserkey.c
index 1c5469522b2fb1f6fc8211f2bfd5754148bbb586..9fd3bb64e3d43933c1a9bc9ac5cfdeeb87671c88 100644 (file)
--- a/citadel/server/makeuserkey.c
+++ b/citadel/server/makeuserkey.c
@@ -3,7 +3,7 @@
 // Copyright (c) 1987-2024 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or disclosure
-// are subject to the terms of the GNU General Public License, version 3.
+// is subject to the terms of the GNU General Public License, version 3.
 
 #include <stdlib.h>
 #include <unistd.h>

diff --git a/citadel/server/modules/autocompletion/serv_autocompletion.c b/citadel/server/modules/autocompletion/serv_autocompletion.c
index d8e04cb798166d4d84e900b9e2f436e200a9862e..f9e4029ceaea3f43fafc232aca0243f5d83972f1 100644 (file)
--- a/citadel/server/modules/autocompletion/serv_autocompletion.c
+++ b/citadel/server/modules/autocompletion/serv_autocompletion.c
@@ -3,7 +3,7 @@
 // Copyright (c) 1987-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or disclosure
-// are subject to the terms of the GNU General Public License version 3.
+// is subject to the terms of the GNU General Public License version 3.
 
 #include "../../ctdl_module.h"
 #include "serv_autocompletion.h"

diff --git a/citadel/server/modules/imap/imap_acl.c b/citadel/server/modules/imap/imap_acl.c
index 69e56301d27fe7452ad724179f806f12af5d33c3..7965322e0b103ae3919aabaef58abda38ef8600b 100644 (file)
--- a/citadel/server/modules/imap/imap_acl.c
+++ b/citadel/server/modules/imap/imap_acl.c
@@ -3,7 +3,7 @@
 // Copyright (c) 2007-2023 by the citadel.org team
 //
 //  This program is open source software.  Use, duplication or disclosure
-//  are subject to the terms of the GNU General Public License, version 3.
+//  is subject to the terms of the GNU General Public License, version 3.
 
 #include "../../sysdep.h"
 #include <stdlib.h>

diff --git a/citadel/server/modules/nntp/serv_nntp.c b/citadel/server/modules/nntp/serv_nntp.c
index b80087a08ffe7fd59d41f1489afe697baf205cd4..4c581db632432c11313da844022969afb446807d 100644 (file)
--- a/citadel/server/modules/nntp/serv_nntp.c
+++ b/citadel/server/modules/nntp/serv_nntp.c
@@ -3,7 +3,7 @@
 // Copyright (c) 2014-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or disclosure
-// are subject to the terms of the GNU General Public License version 3.
+// is subject to the terms of the GNU General Public License version 3.
 
 #include "../../sysdep.h"
 #include <stdlib.h>

diff --git a/citadel/server/sysconfig.h b/citadel/server/sysconfig.h
index a6d4fe967dbdce1d46192fc1110d724cb834a800..e52beaeb14932c2ec4614d95fe9936d3f31a69ee 100644 (file)
--- a/citadel/server/sysconfig.h
+++ b/citadel/server/sysconfig.h
@@ -4,7 +4,7 @@
 // Copyright (c) 1987-2024 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or disclosure
-// are subject to the terms of the GNU General Public License version 3.
+// is subject to the terms of the GNU General Public License version 3.
 
 // NLI is the string that shows up in a <W>ho's online listing for sessions
 // that are active, but for which no user has yet authenticated.

diff --git a/libcitadel/lib/decode.c b/libcitadel/lib/decode.c
index 58e54b95a5b0b5f93ac06bee0a20fecd95398768..7901ba138dab7766df081bad2a7dae54760cb2d8 100644 (file)
--- a/libcitadel/lib/decode.c
+++ b/libcitadel/lib/decode.c
@@ -1,7 +1,7 @@
 // Copyright (c) 1996-2022 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or disclosure
-// are subject to the terms of the GNU General Public License v3.
+// is subject to the terms of the GNU General Public License v3.
 
 
 #include <stdlib.h>

diff --git a/textclient/citadel.c b/textclient/citadel.c
index c151f6120dbd219bf8af6d0aef5d65ef6211cc39..a2875ef70e25cad60d287d3855a5fe1eb99064f0 100644 (file)
--- a/textclient/citadel.c
+++ b/textclient/citadel.c
@@ -3,7 +3,7 @@
 // Copyright (c) 1987-2022 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, and/or
-// disclosure are subject to the GNU General Purpose License version 3.
+// disclosure is subject to the GNU General Purpose License version 3.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/textclient/citadel_ipc.c b/textclient/citadel_ipc.c
index d57edc4a817fb6ab007f3557b613fe3e17db958d..d5899c247fc5271c85fdf0486c2d9a7e5d925ea5 100644 (file)
--- a/textclient/citadel_ipc.c
+++ b/textclient/citadel_ipc.c
@@ -1,7 +1,7 @@
 // Copyright (c) 1987-2022 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, and/or
-// disclosure are subject to the GNU General Purpose License version 3.
+// disclosure is subject to the GNU General Purpose License version 3.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/textclient/client_chat.c b/textclient/client_chat.c
index 68ba3a520385429d134f42ad5e1e6e7a51701f80..0ce8d92437b2ff82efb6e9e616272d1cb17a780a 100644 (file)
--- a/textclient/client_chat.c
+++ b/textclient/client_chat.c
@@ -3,7 +3,7 @@
 // Copyright (c) 1987-2016 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, and/or
-// disclosure are subject to the GNU General Purpose License version 3.
+// disclosure is subject to the GNU General Purpose License version 3.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/textclient/client_passwords.c b/textclient/client_passwords.c
index f4e0a89fa3218a0ae887c07f0be8d7ed8ea91601..d2992bee03d902fc85955af7256219e6f681c151 100644 (file)
--- a/textclient/client_passwords.c
+++ b/textclient/client_passwords.c
@@ -4,7 +4,7 @@
 // Copyright (c) 1987-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, and/or
-// disclosure are subject to the GNU General Purpose License version 3.
+// disclosure is subject to the GNU General Purpose License version 3.
 
 #include "textclient.h"
 

diff --git a/textclient/commands.c b/textclient/commands.c
index fc0fe2d130621e36bba65d589d6b78107b99adfc..6af74c788ab20c55512a658fc5949025765871b5 100644 (file)
--- a/textclient/commands.c
+++ b/textclient/commands.c
@@ -4,7 +4,7 @@
 // Copyright (c) 1987-2022 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, and/or
-// disclosure are subject to the GNU General Purpose License version 3.
+// disclosure is subject to the GNU General Purpose License version 3.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/textclient/ipc_c_tcp.c b/textclient/ipc_c_tcp.c
index 573f872d3c98400a46b1ebc94f601a8e968fc569..0a448c97d60a0cabac16510d639890e01dec13a2 100644 (file)
--- a/textclient/ipc_c_tcp.c
+++ b/textclient/ipc_c_tcp.c
@@ -3,7 +3,7 @@
 // Copyright (c) 1987-2018 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, and/or
-// disclosure are subject to the GNU General Purpose License version 3.
+// disclosure is subject to the GNU General Purpose License version 3.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/textclient/messages.c b/textclient/messages.c
index 93641b723f77e828b174a7a2c702121f14fe78af..9f7d4317270cafd27f2b15871972fed9030bc7ee 100644 (file)
--- a/textclient/messages.c
+++ b/textclient/messages.c
@@ -7,7 +7,7 @@
 // Copyright (c) 1987-2022 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, and/or
-// disclosure are subject to the GNU General Purpose License version 3.
+// disclosure is subject to the GNU General Purpose License version 3.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/textclient/routines.c b/textclient/routines.c
index d74c80e6cad47e2da1f40b572fd8b69956912c9b..7db33c0b3bbbf05c6770ca54173a1bde2ea8c036 100644 (file)
--- a/textclient/routines.c
+++ b/textclient/routines.c
@@ -3,7 +3,7 @@
 // Copyright (c) 1987-2016 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, and/or
-// disclosure are subject to the GNU General Purpose License version 3.
+// disclosure is subject to the GNU General Purpose License version 3.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/textclient/routines2.c b/textclient/routines2.c
index ebabf6e3ef7dfcb010485e68b64d37af37e70fde..10bd064042dce3302f1082e20bade0dbe6eaddff 100644 (file)
--- a/textclient/routines2.c
+++ b/textclient/routines2.c
@@ -3,7 +3,7 @@
 // Copyright (c) 1987-2017 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, and/or
-// disclosure are subject to the GNU General Purpose License version 3.
+// disclosure is subject to the GNU General Purpose License version 3.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/textclient/screen.c b/textclient/screen.c
index 45112f7a5bd6578bd4ddb6fb2218ccdb212fe96e..ea4fc5d9e5b599605895917682f883defdc2254f 100644 (file)
--- a/textclient/screen.c
+++ b/textclient/screen.c
@@ -3,7 +3,7 @@
 // Copyright (c) 1987-2021 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, and/or
-// disclosure are subject to the GNU General Purpose License version 3.
+// disclosure is subject to the GNU General Purpose License version 3.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/textclient/textclient.h b/textclient/textclient.h
index d36bcdb22b49d12dd3dfbfa1f4e9df641280c92e..dadf79255836a392139cd77850a6d61ace39a2c3 100644 (file)
--- a/textclient/textclient.h
+++ b/textclient/textclient.h
@@ -1,7 +1,7 @@
 // Copyright (c) 1987-2022 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, and/or
-// disclosure are subject to the GNU General Purpose License version 3.
+// disclosure is subject to the GNU General Purpose License version 3.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/textclient/tuiconfig.c b/textclient/tuiconfig.c
index aefae6aedd9161a5105aef5189ce71e45d20085c..ee6006b92ba5678f738332dd1523c99a85dc2559 100644 (file)
--- a/textclient/tuiconfig.c
+++ b/textclient/tuiconfig.c
@@ -3,7 +3,7 @@
 // Copyright (c) 1987-2022 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, and/or
-// disclosure are subject to the GNU General Purpose License version 3.
+// disclosure is subject to the GNU General Purpose License version 3.
 //
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/webcit-ng/server/admin_functions.c b/webcit-ng/server/admin_functions.c
index 7a585e49e332630ae0da94bb461db790009e8604..62843f26e6933fb30aef2bc9fbcb5866e478c9f7 100644 (file)
--- a/webcit-ng/server/admin_functions.c
+++ b/webcit-ng/server/admin_functions.c
@@ -3,7 +3,7 @@
 // Copyright (c) 1996-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 #include "webcit.h"
 

diff --git a/webcit-ng/server/caldav_reports.c b/webcit-ng/server/caldav_reports.c
index 7fe12ff3ae2b38c0a6245f5d45fe4023da6fc8da..70a4e8095722d8312f763319bdf07a72f6ad97f5 100644 (file)
--- a/webcit-ng/server/caldav_reports.c
+++ b/webcit-ng/server/caldav_reports.c
@@ -4,7 +4,7 @@
 // Copyright (c) 2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 #include "webcit.h"
 

diff --git a/webcit-ng/server/calendar_functions.c b/webcit-ng/server/calendar_functions.c
index d127b63de7d0e0f73b9097700f3dd3996c07fe36..47e2bffbd188d70570da9e33da6a3fbcede52427 100644 (file)
--- a/webcit-ng/server/calendar_functions.c
+++ b/webcit-ng/server/calendar_functions.c
@@ -3,7 +3,7 @@
 // Copyright (c) 1996-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 #include "webcit.h"
 

diff --git a/webcit-ng/server/ctdl_commands.c b/webcit-ng/server/ctdl_commands.c
index 2637d9e25471348da8dadea3452ac27cee5eb110..61b06730333fd6af7a8422c5dd793cc00e8befdb 100644 (file)
--- a/webcit-ng/server/ctdl_commands.c
+++ b/webcit-ng/server/ctdl_commands.c
@@ -1,7 +1,7 @@
 // Copyright (c) 1996-2022 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 #include "webcit.h"
 

diff --git a/webcit-ng/server/ctdlclient.c b/webcit-ng/server/ctdlclient.c
index 55ddb19b812d345216c82c465ae39520d8820801..f7d03615c6c563d0ff4e32ed27282cc5a6fffb33 100644 (file)
--- a/webcit-ng/server/ctdlclient.c
+++ b/webcit-ng/server/ctdlclient.c
@@ -3,7 +3,7 @@
 // Copyright (c) 1987-2022 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 #include "webcit.h"
 

diff --git a/webcit-ng/server/ctdlfunctions.c b/webcit-ng/server/ctdlfunctions.c
index 371dbc828cbf0ff47da2b663a25c5a9e4e4ca043..d6798d2ab5749e29c658dbf11387ea5dbde39cef 100644 (file)
--- a/webcit-ng/server/ctdlfunctions.c
+++ b/webcit-ng/server/ctdlfunctions.c
@@ -3,7 +3,7 @@
 // Copyright (c) 2016-2022 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 #include "webcit.h"
 

diff --git a/webcit-ng/server/floor_functions.c b/webcit-ng/server/floor_functions.c
index 7dff4dbece5c9710982928e21569242faa82f89c..accd6dda05ede571d6502697de4975e13a30222d 100644 (file)
--- a/webcit-ng/server/floor_functions.c
+++ b/webcit-ng/server/floor_functions.c
@@ -3,7 +3,7 @@
 // Copyright (c) 1996-2022 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 #include "webcit.h"
 

diff --git a/webcit-ng/server/forum_view.c b/webcit-ng/server/forum_view.c
index 13d9ad00c3744dfe42211a592bbb8af01b37946c..188f2e8cc509ccfb02529f755beb99a9e901cac5 100644 (file)
--- a/webcit-ng/server/forum_view.c
+++ b/webcit-ng/server/forum_view.c
@@ -4,7 +4,7 @@
 // Copyright (c) 1996-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 #include "webcit.h"
 

diff --git a/webcit-ng/server/html2html.c b/webcit-ng/server/html2html.c
index 02e5ed79104bf4c203d3510e1a72875cc4cd9477..f04ddef7f7eda0acd237b572668990853b5e058d 100644 (file)
--- a/webcit-ng/server/html2html.c
+++ b/webcit-ng/server/html2html.c
@@ -4,7 +4,7 @@
 // Copyright (c) 2005-2022 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 #include "webcit.h"
 

diff --git a/webcit-ng/server/http.c b/webcit-ng/server/http.c
index 1740ccec83fdfac8456f84fa02d2a108e441adbd..d6037f94365f6851f8e1a8138b86caa6fd3dc45e 100644 (file)
--- a/webcit-ng/server/http.c
+++ b/webcit-ng/server/http.c
@@ -3,7 +3,7 @@
 // Copyright (c) 1996-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 // uncomment one or more of these to see raw http transactions
 //#define DEBUG_HTTP

diff --git a/webcit-ng/server/main.c b/webcit-ng/server/main.c
index 551d8bd9577dc5b2feb170590d24364995f6cad9..77842528be485f644909f34a20a8c50c1816e500 100644 (file)
--- a/webcit-ng/server/main.c
+++ b/webcit-ng/server/main.c
@@ -3,7 +3,7 @@
 // Copyright (c) 1996-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 #include "webcit.h"            // All other headers are included from this header.
 

diff --git a/webcit-ng/server/messages.c b/webcit-ng/server/messages.c
index 6cb103612d2d6eb4670ebbd85d405d221436c315..e9cb5a458268927b7b8b357da4a55b5682e0643d 100644 (file)
--- a/webcit-ng/server/messages.c
+++ b/webcit-ng/server/messages.c
@@ -3,7 +3,7 @@
 // Copyright (c) 1996-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 #include "webcit.h"
 

diff --git a/webcit-ng/server/request.c b/webcit-ng/server/request.c
index e598cf1f68dd7c8c41499a66070449fbbd47e68f..c0fa86b2cb9568d06e714a1560d4ae724e9410f0 100644 (file)
--- a/webcit-ng/server/request.c
+++ b/webcit-ng/server/request.c
@@ -7,7 +7,7 @@
 // Copyright (c) 1996-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 #include "webcit.h"
 

diff --git a/webcit-ng/server/room_functions.c b/webcit-ng/server/room_functions.c
index 12b5df5985a68bf1ef37fdea0df38ef31a6b70a3..8b3ea950c67ca4e7a541714d6b948b47e0280108 100644 (file)
--- a/webcit-ng/server/room_functions.c
+++ b/webcit-ng/server/room_functions.c
@@ -3,7 +3,7 @@
 // Copyright (c) 1996-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 #include "webcit.h"
 

diff --git a/webcit-ng/server/static.c b/webcit-ng/server/static.c
index 632773da6c5f125621b3d45bcef08d974cfa9cbc..0599e899f73d914ad904b21601c1b4b6054fa43b 100644 (file)
--- a/webcit-ng/server/static.c
+++ b/webcit-ng/server/static.c
@@ -3,7 +3,7 @@
 // Copyright (c) 1996-2022 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 #include "webcit.h"
 

diff --git a/webcit-ng/server/tcp_sockets.c b/webcit-ng/server/tcp_sockets.c
index 5d4fbc2546e7e7cc45824e70a2bbaaf738df4384..82206fdc3822b26f74c4feb0ae14e76d992ea222 100644 (file)
--- a/webcit-ng/server/tcp_sockets.c
+++ b/webcit-ng/server/tcp_sockets.c
@@ -3,7 +3,7 @@
 // Copyright (c) 1987-2022 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 #include "webcit.h"
 

diff --git a/webcit-ng/server/text2html.c b/webcit-ng/server/text2html.c
index b6def65acdc55ad2a69ffc9aca688ab476b66714..5c7eba6e23fd6e7c9fa4a95d4e0fcb15127ed01a 100644 (file)
--- a/webcit-ng/server/text2html.c
+++ b/webcit-ng/server/text2html.c
@@ -3,7 +3,7 @@
 // Copyright (c) 2017-2022 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 #include "webcit.h"
 

diff --git a/webcit-ng/server/tls.c b/webcit-ng/server/tls.c
index c0e26f0d4a0370f94fb7c573953b15f490a9a6dc..e0a9e137fe612d10400317784e4f116d2382dc22 100644 (file)
--- a/webcit-ng/server/tls.c
+++ b/webcit-ng/server/tls.c
@@ -4,7 +4,7 @@
 // Copyright (c) 1996-2022 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 #include "webcit.h"
 

diff --git a/webcit-ng/server/upload.c b/webcit-ng/server/upload.c
index 961d1845748f79a10b4d3002b5fce89a0c8864ea..dcad84bc5248655d48a3b8a6ed97ab4c9ed1c682 100644 (file)
--- a/webcit-ng/server/upload.c
+++ b/webcit-ng/server/upload.c
@@ -3,7 +3,7 @@
 // Copyright (c) 1996-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 #include "webcit.h"
 

diff --git a/webcit-ng/server/user_functions.c b/webcit-ng/server/user_functions.c
index 45cd3118d2d5a08f0c04355d294077de5023f48b..d4db7571f09a0fb6b056932b1635b165b8848274 100644 (file)
--- a/webcit-ng/server/user_functions.c
+++ b/webcit-ng/server/user_functions.c
@@ -3,7 +3,7 @@
 // Copyright (c) 1996-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 #include "webcit.h"
 

diff --git a/webcit-ng/server/util.c b/webcit-ng/server/util.c
index ff256e520e844496dad67a0834976c12e75ba5aa..6ab4ef04c5a7e59a8525b79d67bd1aa6b626bd66 100644 (file)
--- a/webcit-ng/server/util.c
+++ b/webcit-ng/server/util.c
@@ -1,6 +1,6 @@
 // Utility functions
 // Copyright (c) 1996-2023 by the citadel.org team
-// This program is open source software.  Use, duplication, or disclosure are subject to the GNU General Public License v3.
+// This program is open source software.  Use, duplication, or disclosure is subject to the GNU General Public License v3.
 
 #include "webcit.h"
 

diff --git a/webcit-ng/server/webserver.c b/webcit-ng/server/webserver.c
index 2e22efabd669b5f34835fff04c772d271094c61f..1a4545fa9c999ac37d2e5aaa57dfb8329ca29b62 100644 (file)
--- a/webcit-ng/server/webserver.c
+++ b/webcit-ng/server/webserver.c
@@ -7,7 +7,7 @@
 // Copyright (c) 1996-2022 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 #include "webcit.h"                    // All other headers are included from this header.
 

diff --git a/webcit-ng/static/js/defs.js b/webcit-ng/static/js/defs.js
index 3fb11d7a9aecbebd6742187846e037cafdf5726c..bdf71a447b8ca20471242880af6d834b71251324 100644 (file)
--- a/webcit-ng/static/js/defs.js
+++ b/webcit-ng/static/js/defs.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2016-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 // Placeholder for when we add i18n later
 function _(x) {

diff --git a/webcit-ng/static/js/login.js b/webcit-ng/static/js/login.js
index 22aa16412d7280f2e44c1f6ae15c7823e58f301c..11592ee62fd7febad0e1a554960f8c6ac5ef0f8f 100644 (file)
--- a/webcit-ng/static/js/login.js
+++ b/webcit-ng/static/js/login.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2016-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 
 // This is where the login screen (modal) is displayed.

diff --git a/webcit-ng/static/js/mail_folder_list.js b/webcit-ng/static/js/mail_folder_list.js
index d88c5f09c72549eb65f8477115092d089927b152..fff055d749385c43b58541680d291b40130d4232 100644 (file)
--- a/webcit-ng/static/js/mail_folder_list.js
+++ b/webcit-ng/static/js/mail_folder_list.js
@@ -3,7 +3,7 @@
 // Copyright (c) 2016-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 
 // Display the mail folder list in the specified div

diff --git a/webcit-ng/static/js/main.js b/webcit-ng/static/js/main.js
index 541a593c62db5d986cd317abe94fe5bb260fe7f7..6af9c1421fc69c99b6ef7c973d75071f4bb1a6ef 100644 (file)
--- a/webcit-ng/static/js/main.js
+++ b/webcit-ng/static/js/main.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2016-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 
 do_biff = async() => {

diff --git a/webcit-ng/static/js/roomlist.js b/webcit-ng/static/js/roomlist.js
index 6d1676c140de40dad8e671c57678481ed2fd844a..0fc0969cbe0be8971e568e1f96801ca16c7f5b94 100644 (file)
--- a/webcit-ng/static/js/roomlist.js
+++ b/webcit-ng/static/js/roomlist.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2016-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 
 function render_room_list() {

diff --git a/webcit-ng/static/js/upload.js b/webcit-ng/static/js/upload.js
index 3f6a33519f4372f64f0102c0e3d1b3eda048577a..a4bc77a4082bf5b1668c393fd6cfd9cd398db4e9 100644 (file)
--- a/webcit-ng/static/js/upload.js
+++ b/webcit-ng/static/js/upload.js
@@ -4,7 +4,7 @@
 // Copyright (c) 2016-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 var uploads_in_progress = 0;
 var uploads = [] ;                                                             // everything the user has uploaded

diff --git a/webcit-ng/static/js/user_profile.js b/webcit-ng/static/js/user_profile.js
index 3b218f4e86538d9a30d87cafba0f44c1d3df2fc0..52e2be2a8daa720023c823d45759c781103b9a46 100644 (file)
--- a/webcit-ng/static/js/user_profile.js
+++ b/webcit-ng/static/js/user_profile.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2016-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 
 // Inline display the author of a message.  This can be called from many different views.

diff --git a/webcit-ng/static/js/util.js b/webcit-ng/static/js/util.js
index 1f3ae65f8806b961333089a0e8a6566dbd656f55..eb467ab39c227cd36229651e347eaa4dba3cc07d 100644 (file)
--- a/webcit-ng/static/js/util.js
+++ b/webcit-ng/static/js/util.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2016-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 
 //     // (We don't need this anymore because we encode on the server side)

diff --git a/webcit-ng/static/js/view_calendar.js b/webcit-ng/static/js/view_calendar.js
index 1ac05266a0a5aa1d3dcdac9829f42e5840d4b57e..786090aa6aec57a99cde57ffb4bc5a33d2485711 100644 (file)
--- a/webcit-ng/static/js/view_calendar.js
+++ b/webcit-ng/static/js/view_calendar.js
@@ -3,7 +3,7 @@
 // Copyright (c) 2016-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 
 // RENDERER FOR THIS VIEW

diff --git a/webcit-ng/static/js/view_contacts.js b/webcit-ng/static/js/view_contacts.js
index d6503eaac2692d6a60076f4faa535c6e66524a56..0ef980420016a8748fbe383465757b9e9aaf80d0 100644 (file)
--- a/webcit-ng/static/js/view_contacts.js
+++ b/webcit-ng/static/js/view_contacts.js
@@ -3,7 +3,7 @@
 // Copyright (c) 2016-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 
 // RENDERER FOR THIS VIEW

diff --git a/webcit-ng/static/js/view_forum.js b/webcit-ng/static/js/view_forum.js
index 1357929f1808791f9b7ccef8d2490230ef3e3510..e5884d400b32ee133b757e459778ac0c1bfe88b1 100644 (file)
--- a/webcit-ng/static/js/view_forum.js
+++ b/webcit-ng/static/js/view_forum.js
@@ -3,7 +3,7 @@
 // Copyright (c) 2016-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 
 // Forum view (flat)

diff --git a/webcit-ng/static/js/view_mail.js b/webcit-ng/static/js/view_mail.js
index 37fcdbbe79ab05d9619ed799f0656f2af0c4be60..b6e09893ce5c32bbd8067c92923e0cfa46c947d3 100644 (file)
--- a/webcit-ng/static/js/view_mail.js
+++ b/webcit-ng/static/js/view_mail.js
@@ -3,7 +3,7 @@
 // Copyright (c) 2016-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 
 var displayed_message = 0;                                                     // ID of message currently being displayed

diff --git a/webcit-ng/static/js/views.js b/webcit-ng/static/js/views.js
index 6c235fcdec530871dc93a42d059af2d23579a630..e6b769d194e3aafd4951dd8cd34b7aed8eae15c4 100644 (file)
--- a/webcit-ng/static/js/views.js
+++ b/webcit-ng/static/js/views.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2016-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or
-// disclosure are subject to the GNU General Public License v3.
+// disclosure is subject to the GNU General Public License v3.
 
 
 // Clear the sidebar buttons of any style indicating that one is selected

diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index 38294f0013b10d9aa32450b98bea1e3b61272bde..6231da9aacf518f56fb79d2a5e07bfdcfe9f9a11 100644 (file)
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -3,7 +3,7 @@
 // Copyright (c) 1996-2023 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or disclosure
-// are subject to the terms of the GNU General Public License, version 3.
+// is subject to the terms of the GNU General Public License, version 3.
 
 #include "webcit.h"
 #include "webserver.h"

diff --git a/webcit/webserver.c b/webcit/webserver.c
index ba9937f8061c4fae17322f230bc4d9fd7f8acd11..a12143eef51ba3f9f9fbd2f9c2b9a5d8e4bf5c3d 100644 (file)
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -1,7 +1,7 @@
 // Copyright (c) 1996-2024 by the citadel.org team
 //
 // This program is open source software.  Use, duplication, or disclosure
-// are subject to the terms of the GNU General Public License version 3.
+// is subject to the terms of the GNU General Public License version 3.
 
 #include "webcit.h"
 #include "webserver.h"
@@ -216,7 +216,7 @@ int main(int argc, char **argv) {
        syslog(LOG_NOTICE, "Copyright (C) 1996-2024 by the citadel.org team");
        syslog(LOG_NOTICE, " ");
        syslog(LOG_NOTICE, "This program is open source software.  Use, duplication, or disclosure");
-       syslog(LOG_NOTICE, "are subject to the terms of the GNU General Public License, version 3.");
+       syslog(LOG_NOTICE, "is subject to the terms of the GNU General Public License, version 3.");
        syslog(LOG_NOTICE, " ");
 
        /* run from the webcit home directory */