diff --git a/400_xowa/src/gplx/xowa/apps/boots/Xoa_cmd_arg_mgr_.java b/400_xowa/src/gplx/xowa/apps/boots/Xoa_cmd_arg_mgr_.java index e02c42980..44757bed2 100644 --- a/400_xowa/src/gplx/xowa/apps/boots/Xoa_cmd_arg_mgr_.java +++ b/400_xowa/src/gplx/xowa/apps/boots/Xoa_cmd_arg_mgr_.java @@ -36,8 +36,8 @@ class Xoa_cmd_arg_mgr_ { , newLine , "The terms of each license can be found in the following files:", lineEnd , newLine - , "GPLv3 License: LICENSE-GPLv3.txt" - , "Apache License: LICENSE-APACHE2.txt" + , "GPLv3 License: LICENSE-GPLv3.txt", lineEnd + , "Apache License: LICENSE-APACHE2.txt", lineEnd , codeEnd , hdr_end ); diff --git a/400_xowa/src/gplx/xowa/apps/servers/http/Http_server_mgr.java b/400_xowa/src/gplx/xowa/apps/servers/http/Http_server_mgr.java index 2ce29e7b8..36ec0536b 100644 --- a/400_xowa/src/gplx/xowa/apps/servers/http/Http_server_mgr.java +++ b/400_xowa/src/gplx/xowa/apps/servers/http/Http_server_mgr.java @@ -15,20 +15,18 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ /* This file is part of XOWA: the XOWA Offline Wiki Application -Copyright (C) 2013 matthiasjasny@gmail.com +Copyright (C) 2013 matthiasjasny@gmail.com; gnosygnu@gmail.com -This file is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as -published by the Free Software Foundation, either version 3 of the -License, or (at your option) any later version. +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. -This file is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see . +The terms of each license can be found in the following files: + +GPLv3 License: LICENSE-GPLv3.txt +Apache License: LICENSE-APACHE2.txt */ package gplx.xowa.apps.servers.http; import gplx.*; import gplx.xowa.*; import gplx.xowa.apps.*; import gplx.xowa.apps.servers.*; import gplx.core.threads.*; import gplx.core.net.*; import gplx.core.primitives.*; import gplx.core.envs.*;