SF.net SVN: geany: [481] trunk
eht16 at users.sourceforge.net
eht16 at xxxxx
Sun Jun 25 14:43:16 UTC 2006
Revision: 481
Author: eht16
Date: 2006-06-25 07:43:09 -0700 (Sun, 25 Jun 2006)
ViewCVS: http://svn.sourceforge.net/geany/?rev=481&view=rev
Log Message:
-----------
Added license notice Scintilla.
Modified Paths:
--------------
trunk/ChangeLog
trunk/README
trunk/doc/geany.docbook
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-06-25 12:48:38 UTC (rev 480)
+++ trunk/ChangeLog 2006-06-25 14:43:09 UTC (rev 481)
@@ -1,3 +1,8 @@
+2006-06-25 Enrico Troeger <enrico.troeger at uvena.de>
+
+ * README, doc/geany.docbook: Added license notice Scintilla.
+
+
2006-06-25 Nick Treleaven <nick.treleaven at btinternet.com>
* src/notebook.c, src/notebook.h, src/document.c, src/callbacks.c,
Modified: trunk/README
===================================================================
--- trunk/README 2006-06-25 12:48:38 UTC (rev 480)
+++ trunk/README 2006-06-25 14:43:09 UTC (rev 481)
@@ -74,6 +74,17 @@
- support for detecting a running instance
+License
+-------
+Geany is distributed under the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2 of the License, or (at your option) any later version.
+A copy of this license can be found in the file COPYING included with the source code of this
+program.
+The included Scintilla library (found in the subdirectory scintilla/) has its own license, which
+can be found in the file scintilla/License.txt included with the source code of this
+program.
+
+
Ideas, questions, patches and bug reports
-----------------------------------------
See http://geany.uvena.de
Modified: trunk/doc/geany.docbook
===================================================================
--- trunk/doc/geany.docbook 2006-06-25 12:48:38 UTC (rev 480)
+++ trunk/doc/geany.docbook 2006-06-25 14:43:09 UTC (rev 481)
@@ -90,8 +90,12 @@
<application>&app;</application> is distributed under the terms of the GNU General Public License as published
by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
A copy of this license can be found in the file COPYING included with the source code of this
- program and in the appendix of this document.
+ program and in the appendix A of this document.
</para>
+ <para>
+ The included Scintilla library (found in the subdirectory scintilla/) has its own
+ license, which can be found in the appendix(see <xref linkend="scintilla-license"/>).
+ </para>
</section>
</chapter>
@@ -1392,4 +1396,22 @@
<!-- GPL appendix -->
&legal;
+ <appendix id="scintilla-license">
+ <title>License for Scintilla and SciTE</title>
+ <para>Copyright 1998-2003 by Neil Hodgson <neilh at scintilla.org></para>
+ <para>All Rights Reserved</para>
+ <para>Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose and without fee is hereby granted, provided that
+ the above copyright notice appear in all copies and that both that copyright
+ notice and this permission notice appear in supporting documentation.
+ </para>
+ <para>NEIL HODGSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NEIL HODGSON
+ BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+ CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ </para>
+ </appendix>
+
</book>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list