summaryrefslogtreecommitdiffstats
path: root/perl-install/messages.pm
diff options
context:
space:
mode:
authorAnne Nicolas <ennael@mageia.org>2011-02-11 08:59:42 +0000
committerAnne Nicolas <ennael@mageia.org>2011-02-11 08:59:42 +0000
commit315a0589eb0f73fdb1dc68ceae9e8a4ef01a8cff (patch)
treea15ca2c84b9953fa72192bbcb9553c313dd4640a /perl-install/messages.pm
parent2c5ea7b5eb8d456cd2225156f2703ffd49fb01bb (diff)
downloaddrakx-315a0589eb0f73fdb1dc68ceae9e8a4ef01a8cff.tar
drakx-315a0589eb0f73fdb1dc68ceae9e8a4ef01a8cff.tar.gz
drakx-315a0589eb0f73fdb1dc68ceae9e8a4ef01a8cff.tar.bz2
drakx-315a0589eb0f73fdb1dc68ceae9e8a4ef01a8cff.tar.xz
drakx-315a0589eb0f73fdb1dc68ceae9e8a4ef01a8cff.zip
correct and remove google license
Diffstat (limited to 'perl-install/messages.pm')
-rw-r--r--perl-install/messages.pm21
1 files changed, 1 insertions, 20 deletions
diff --git a/perl-install/messages.pm b/perl-install/messages.pm
index fda56abf2..b3e866172 100644
--- a/perl-install/messages.pm
+++ b/perl-install/messages.pm
@@ -7,9 +7,6 @@ use common;
sub main_license {
- #TODO: Change the API to not use $google, which is unused now
- my ($us, $google) = @_;
-
#-PO: keep the double empty lines between sections, this is formatted a la LaTeX
N("Introduction
@@ -89,23 +86,7 @@ agreement.
The terms and conditions of this License are governed by the Laws of France.
All disputes on the terms of this license will preferably be settled out of court. As a last
resort, the dispute will be referred to the appropriate Courts of Law of Paris - France.
-For any question on this document, please contact Mageia",
-$us ? "\n\n" . N("You agree not to (i) sell, export, re-export, transfer, divert, disclose technical data, or
-dispose of, any Software to any person, entity, or destination prohibited by US export laws
-or regulations including, without limitation, Cuba, Iran, North Korea, Sudan and Syria; or
-(ii) use any Software for any use prohibited by the laws or regulations of the United States.
-
-U.S. GOVERNMENT RESTRICTED RIGHTS.
-
-The Software Products and any accompanying documentation are and shall be deemed to be
-\"commercial computer software\" and \"commercial computer software documentation,\" respectively,
-as defined in DFAR 252.227-7013 and as described in FAR 12.212. Any use, modification, reproduction,
-release, performance, display or disclosure of the Software and any accompanying documentation
-by the United States Government shall be governed solely by the terms of this Agreement and any
-other applicable licence agreements and shall be prohibited except to the extent expressly permitted
-by the terms of this Agreement.") . "\n" : '',
-N("Most of these components are governed under the terms and conditions of the GNU
-General Public Licence, hereafter called \"GPL\", or of similar licenses."));
+For any question on this document, please contact Mageia.
}
sub warning_about_patents() {