|
From: <ge...@us...> - 2007-11-21 21:44:21
|
Revision: 4783
http://winmerge.svn.sourceforge.net/winmerge/?rev=4783&view=rev
Author: gerundt
Date: 2007-11-21 13:44:19 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
BUG: [ 1817626 ] Menu item "Help->GPL" links to GPLv3
Modified Paths:
--------------
trunk/Docs/Users/Manual/Introduction.xml
trunk/Src/MainFrm.cpp
trunk/Web/support/index.php
Modified: trunk/Docs/Users/Manual/Introduction.xml
===================================================================
--- trunk/Docs/Users/Manual/Introduction.xml 2007-11-21 14:28:17 UTC (rev 4782)
+++ trunk/Docs/Users/Manual/Introduction.xml 2007-11-21 21:44:19 UTC (rev 4783)
@@ -27,7 +27,7 @@
reliable program to use.</para>
<para>Please note that WinMerge is not a freeware, but it is <ulink
- url="http://www.gnu.org/copyleft/gpl.html">GPL</ulink> licenced. We have
+ url="http://www.gnu.org/licenses/gpl-2.0.html">GPL</ulink> licenced. We have
given you a good tool for free, so please follow our licence and submit your
improvements back to us. We are happy to get help improving WinMerge
further. It is advantage for all WinMerge users.</para>
@@ -199,7 +199,7 @@
url="http://sourceforge.net/tracker/?group_id=13216&atid=313216">patches</ulink>
and help improve this product! If you publish your altered version, you
are required to publish changes source code too, it is what <ulink
- url="http://www.gnu.org/copyleft/gpl.html">GPL</ulink> licence is about.
+ url="http://www.gnu.org/licenses/gpl-2.0.html">GPL</ulink> licence is about.
Please respect it.</para>
<para>While WinMerge development has been fast in last couple of years,
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2007-11-21 14:28:17 UTC (rev 4782)
+++ trunk/Src/MainFrm.cpp 2007-11-21 21:44:19 UTC (rev 4783)
@@ -830,7 +830,7 @@
void CMainFrame::OnHelpGnulicense()
{
const String spath = GetModulePath() + _T("\\Copying");
- const TCHAR url[] = _T("http://www.gnu.org/copyleft/gpl.html");
+ const TCHAR url[] = _T("http://www.gnu.org/licenses/gpl-2.0.html");
OpenFileOrUrl(spath.c_str(), url);
}
Modified: trunk/Web/support/index.php
===================================================================
--- trunk/Web/support/index.php 2007-11-21 14:28:17 UTC (rev 4782)
+++ trunk/Web/support/index.php 2007-11-21 21:44:19 UTC (rev 4783)
@@ -6,7 +6,7 @@
?>
<h2>Support</h2>
<p>WinMerge is an Open Source project, that is covered
-under the <a href="http://www.gnu.org/copyleft/gpl.html">GNU General Public License</a>.
+under the <a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General Public License</a>.
As such, your main form of support for WinMerge will be through
subscription to the <a href="http://lists.sourceforge.net/lists/listinfo/winmerge-support">WinMerge-support mailing list</a>.
In addition, SourceForge has bug tracking capabilities, so please report any
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
