summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-09-14 19:01:30 +0000
committerThierry Vignaud <tv@mageia.org>2012-09-14 19:01:30 +0000
commit1e84ddf089ef40a74d2c3b80bb6b3ceb218e2d59 (patch)
tree9b219bab4e4916dc9024512a11f20dcc0f2496a9
parent7343ab4593d5356fa12ef2fa33dbbc4ecf41b1b2 (diff)
downloaddrakx-1e84ddf089ef40a74d2c3b80bb6b3ceb218e2d59.tar
drakx-1e84ddf089ef40a74d2c3b80bb6b3ceb218e2d59.tar.gz
drakx-1e84ddf089ef40a74d2c3b80bb6b3ceb218e2d59.tar.bz2
drakx-1e84ddf089ef40a74d2c3b80bb6b3ceb218e2d59.tar.xz
drakx-1e84ddf089ef40a74d2c3b80bb6b3ceb218e2d59.zip
(main_license) advertize new doc license (mga#7347)
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/messages.pm3
3 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 985bcfdd3..03ff03993 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,7 @@
- drakbug:
o fix preselecting "RPM package" (Manuel Hiebel, mga#7380)
+- finish-install:
+ o advertize new doc license (mga#7347)
Version 14.43 - 4 September 2012
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index f83678acb..c9589e27a 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,5 @@
- adapt to xserver 1.13
+- advertize new doc license (mga#7347)
- install cpupower instead of cpupower
Version 14.43 - 4 September 2012
diff --git a/perl-install/messages.pm b/perl-install/messages.pm
index 524899361..1d55964b6 100644
--- a/perl-install/messages.pm
+++ b/perl-install/messages.pm
@@ -66,8 +66,7 @@ they cover. Please read carefully the terms and conditions of the license agreem
before using any component. Any question on a component license should be addressed to the component
licensor or supplier and not to Mageia.
The programs developed by Mageia are governed by the GPL License. Documentation written
-by Mageia is governed by a specific license. Please refer to the documentation for
-further details."),
+by Mageia is governed by \"%s\" License.", "CC-By-SA"),
N("4. Intellectual Property Rights