From: Art Cancro Date: Wed, 3 Jan 2024 18:15:24 +0000 (-0500) Subject: Grammar change in the license declaration. X-Git-Tag: v997~40 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=545fc1a847d9401923ef312f995d4f385da84e56 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 e9f2911b5..9ac8817eb 100644 --- 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 7a7a6d5e6..2ebb5d5df 100644 --- 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 #include diff --git a/citadel/server/config.c b/citadel/server/config.c index 7e0db5bb4..fa05c4dfd 100644 --- 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 diff --git a/citadel/server/config.h b/citadel/server/config.h index cbe2548c9..db13fe43e 100644 --- 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 3fa869fc8..11dd19319 100644 --- 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 a83211d39..d7f9771ef 100644 --- 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 51e0c8e29..e8ffe6924 100644 --- 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 diff --git a/citadel/server/makeuserkey.c b/citadel/server/makeuserkey.c index 1c5469522..9fd3bb64e 100644 --- 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 #include diff --git a/citadel/server/modules/autocompletion/serv_autocompletion.c b/citadel/server/modules/autocompletion/serv_autocompletion.c index d8e04cb79..f9e4029ce 100644 --- 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 69e56301d..7965322e0 100644 --- 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 diff --git a/citadel/server/modules/nntp/serv_nntp.c b/citadel/server/modules/nntp/serv_nntp.c index b80087a08..4c581db63 100644 --- 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 diff --git a/citadel/server/sysconfig.h b/citadel/server/sysconfig.h index a6d4fe967..e52beaeb1 100644 --- 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 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 58e54b95a..7901ba138 100644 --- 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 diff --git a/textclient/citadel.c b/textclient/citadel.c index c151f6120..a2875ef70 100644 --- 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 d57edc4a8..d5899c247 100644 --- 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 68ba3a520..0ce8d9243 100644 --- 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 f4e0a89fa..d2992bee0 100644 --- 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 fc0fe2d13..6af74c788 100644 --- 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 573f872d3..0a448c97d 100644 --- 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 93641b723..9f7d43172 100644 --- 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 d74c80e6c..7db33c0b3 100644 --- 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 ebabf6e3e..10bd06404 100644 --- 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 45112f7a5..ea4fc5d9e 100644 --- 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 d36bcdb22..dadf79255 100644 --- 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 aefae6aed..ee6006b92 100644 --- 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 7a585e49e..62843f26e 100644 --- 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 7fe12ff3a..70a4e8095 100644 --- 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 d127b63de..47e2bffbd 100644 --- 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 2637d9e25..61b067303 100644 --- 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 55ddb19b8..f7d03615c 100644 --- 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 371dbc828..d6798d2ab 100644 --- 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 7dff4dbec..accd6dda0 100644 --- 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 13d9ad00c..188f2e8cc 100644 --- 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 02e5ed791..f04ddef7f 100644 --- 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 1740ccec8..d6037f943 100644 --- 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 551d8bd95..77842528b 100644 --- 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 6cb103612..e9cb5a458 100644 --- 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 e598cf1f6..c0fa86b2c 100644 --- 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 12b5df598..8b3ea950c 100644 --- 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 632773da6..0599e899f 100644 --- 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 5d4fbc254..82206fdc3 100644 --- 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 b6def65ac..5c7eba6e2 100644 --- 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 c0e26f0d4..e0a9e137f 100644 --- 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 961d18457..dcad84bc5 100644 --- 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 45cd3118d..d4db7571f 100644 --- 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 ff256e520..6ab4ef04c 100644 --- 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 2e22efabd..1a4545fa9 100644 --- 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 3fb11d7a9..bdf71a447 100644 --- 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 22aa16412..11592ee62 100644 --- 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 d88c5f09c..fff055d74 100644 --- 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 541a593c6..6af9c1421 100644 --- 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 6d1676c14..0fc0969cb 100644 --- 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 3f6a33519..a4bc77a40 100644 --- 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 3b218f4e8..52e2be2a8 100644 --- 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 1f3ae65f8..eb467ab39 100644 --- 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 1ac05266a..786090aa6 100644 --- 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 d6503eaac..0ef980420 100644 --- 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 1357929f1..e5884d400 100644 --- 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 37fcdbbe7..b6e09893c 100644 --- 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 6c235fcde..e6b769d19 100644 --- 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 38294f001..6231da9aa 100644 --- 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 ba9937f80..a12143eef 100644 --- 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 */