[gimp-web] Revert "Bug 551581 - Clarify license, modify About link"
- From: Sven Claussner <sclaussner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp-web] Revert "Bug 551581 - Clarify license, modify About link"
- Date: Sat, 1 Feb 2014 10:28:04 +0000 (UTC)
commit 9c6938db596746b6705af3fcb8676bf7cc3458c9
Author: Sven Claussner <sclaussner src gnome org>
Date: Sat Feb 1 11:19:16 2014 +0100
Revert "Bug 551581 - Clarify license, modify About link"
This reverts commit a5b38834ccf23b5bc60d83dcb491f7d6359852ef.
about/index.htrw | 2 +-
about/selling.htrw | 4 ++--
admin/gimp-web-urls | 2 +-
includes/wgo-page-fini.xhtml | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/about/index.htrw b/about/index.htrw
index 8268ef4..e49d353 100644
--- a/about/index.htrw
+++ b/about/index.htrw
@@ -10,7 +10,7 @@
is a freely distributed program for such tasks
as photo retouching, image composition and image authoring.
The terms of usage and rules about copying are clearly listed in the
- <a href="wgo:license">LICENSE</a> file.</p>
+ <a href="wgo:license">GNU General Public License</a>.</p>
<p>
(<a href="wgo:about-introduction">more ...</a>)
diff --git a/about/selling.htrw b/about/selling.htrw
index b78c32e..cf29488 100755
--- a/about/selling.htrw
+++ b/about/selling.htrw
@@ -20,8 +20,8 @@ suggestions for those who would like to sell GIMP.</p>
<h2>Is it legal to sell copies of GIMP?</h2>
<p>Yes. The terms and conditions for copying, distribution and
-modification of GIMP are clearly listed in the <a
-href="wgo:license">LICENSE</a> file. Redistribution for
+modification of GIMP are clearly listed in the <a
+href="wgo:license">GNU General Public License</a>. Redistribution for
free or for profit is specifically allowed, as long as the license is
included and the source code is made available. See also <a
href="http://www.gnu.org/philosophy/selling.html">Selling Free
diff --git a/admin/gimp-web-urls b/admin/gimp-web-urls
index 0dacf22..f0ba4e2 100644
--- a/admin/gimp-web-urls
+++ b/admin/gimp-web-urls
@@ -189,7 +189,7 @@
["href", "wgo:about-ancient_history", { "href": "/about/ancient_history.html"}]
["href", "wgo:about-authors", { "href": "/about/authors.html"}]
["href", "wgo:about-introduction", { "href": "/about/introduction.html"}]
-["href", "wgo:license", { "href": "https://git.gnome.org/browse/gimp/plain/LICENSE"}]
+["href", "wgo:license", { "href": "/about/COPYING"}]
["href", "wgo:donating", { "href": "/donating/"}]
["href", "wgo:about-merchandise", { "href": "/about/merchandise.html"}]
["href", "wgo:about-selling", { "href": "/about/selling.html"}]
diff --git a/includes/wgo-page-fini.xhtml b/includes/wgo-page-fini.xhtml
index e027421..adcec95 100755
--- a/includes/wgo-page-fini.xhtml
+++ b/includes/wgo-page-fini.xhtml
@@ -29,7 +29,7 @@
</div>
<div class="bottomlinks">
<ul>
- <li class="mainlink"><a href="/about/">About GIMP</a></li>
+ <li class="mainlink"><a href="/about/">History</a></li>
<li><a href="/about/splash/">Splash Archive</a></li>
<li><a href="/links/">Links</a></li>
</ul>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]