From ff0ab2da93b5fe960702306f35d6a91cf4de1089 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Thu, 6 Aug 2015 05:46:24 +0200 Subject: Linux: Correct formating of license displayed in the installer --- src/Setup/Linux/veracrypt_install_template.sh | 48 +++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/Setup/Linux/veracrypt_install_template.sh b/src/Setup/Linux/veracrypt_install_template.sh index 04f6cad5..71ef991d 100644 --- a/src/Setup/Linux/veracrypt_install_template.sh +++ b/src/Setup/Linux/veracrypt_install_template.sh @@ -144,9 +144,9 @@ other names confusingly similar to the name VeraCrypt (e.g., Vera-Crypt, Vera Crypt, VerKrypt, etc.) ____________________________________________________________ - Apache License - Version 2.0, January 2004 - https://www.apache.org/licenses/ +Apache License +Version 2.0, January 2004 +https://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION @@ -181,13 +181,13 @@ not limited to compiled object code, generated documentation, and conversions to other media types. "Work" shall mean the work of authorship, whether in Source or -Object form, made available under the License, as indicated by a -copyright notice that is included in or attached to the work +Object form, made available under the License, as indicated by +a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). "Derivative Works" shall mean any work, whether in Source or -Object form, that is based on (or derived from) the Work and for -which the editorial revisions, annotations, elaborations, or +Object form, that is based on (or derived from) the Work and +for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely @@ -219,8 +219,8 @@ conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, -sublicense, and distribute the Work and such Derivative Works in -Source or Object form. +sublicense, and distribute the Work and such Derivative Works +in Source or Object form. 3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a @@ -255,21 +255,21 @@ that You meet the following conditions: the Derivative Works; and (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute - must include a readable copy of the attribution notices - contained within such NOTICE file, excluding those notices + must include a readable copy of the attribution notices + contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in - at least one of the following places: within a NOTICE text - file distributed as part of the Derivative Works; within the - Source form or documentation, if provided along with the - Derivative Works; or, within a display generated by the - Derivative Works, if and wherever such third-party notices - normally appear. The contents of the NOTICE file are for - informational purposes only and do not modify the License. - You may add Your own attribution notices within Derivative - Works that You distribute, alongside or as an addendum to - the NOTICE text from the Work, provided that such additional + at least one of the following places: within a NOTICE text + file distributed as part of the Derivative Works; within the + Source form or documentation, if provided along with the + Derivative Works; or, within a display generated by the + Derivative Works, if and wherever such third-party notices + normally appear. The contents of the NOTICE file are for + informational purposes only and do not modify the License. + You may add Your own attribution notices within Derivative + Works that You distribute, alongside or as an addendum to + the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying - the License. + the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms @@ -323,8 +323,8 @@ choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your -sole responsibility, not on behalf of any other Contributor, and -only if You agree to indemnify, defend, and hold each +sole responsibility, not on behalf of any other Contributor, +and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. -- cgit v1.2.3