X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fdocs%2Flicense.html;h=fab06f516c8b16102513f39d644ebd0d6b7fff78;hp=8764d730063f0805a7c3993eba72fd7775300adc;hb=1733a4bfa17f1acbc0bfb6e3105e2984eba05910;hpb=95ce32b3b4d3957a90ad0e999f75396063c22b94

diff --git a/httemplate/docs/license.html b/httemplate/docs/license.html
index 8764d7300..fab06f516 100644
--- a/httemplate/docs/license.html
+++ b/httemplate/docs/license.html
@@ -1,12 +1,12 @@
-<% include('/elements/header-popup.html', 'Freeside') %>
+<% include('/elements/header-popup.html', { title=>'Freeside', nobr=>1 } ) %>
 <CENTER>
-<IMG SRC="<%$fsurl%>images/small-logo.png" BORDER=0"><BR>
+<IMG SRC="<%$fsurl%>images/small-logo.png" BORDER="0"><BR>
 <H3>version <% $FS::VERSION %></H3>
 </CENTER>
 
 <P>
 
-Copyright &copy; 2005-2008 Freeside Internet Services, Inc.<BR>
+Copyright &copy; 2005-2016 Freeside Internet Services, Inc.<BR>
 Copyright &copy; 2000-2005 Ivan Kohler<BR>
 Copyright &copy; 1999 Silicon Interactive Software Design<BR>
 All rights reserved<BR>
@@ -30,10 +30,10 @@ All rights reserved<BR>
 
 <P>
     At your option, you may also redistribute and/or modify the files in the
-    fs_selfservice/ directory (but not the rest of the software) under the
-    terms of the GNU General Public License as published by the Free Software
-    Foundation, either version 3 of the License, or (at your option) any later
-    version.
+    fs_selfservice/ and ng_selfservice/ directories (but not the rest of the
+    software) under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or (at your
+    option) any later version.
 
 <P>
     At your option, you may also redistribute and/or modify the
@@ -42,6 +42,7 @@ All rights reserved<BR>
     published by the Free Software Foundation, either version 3 of the License,
     or (at your option) any later version.
 
+
 <!--entire other packages-->
 
 <P>
@@ -52,25 +53,31 @@ Request Tracker software in this case to be "merely aggregated" with Freeside,
 and not a "combined work", and as such Request Tracker is distributed only
 under the original GPLv2 license.
 
+<P>
+Contains "Torrus" <http://www.torrus.org/> from Stanislav Sinyagin / K-Open
+GmbH, licensed under the terms of the GNU GPL.
+
+
 <!--important widgets or other "whole" bits-->
 
 <P>
 Latex invoice template based on a template from eBills
 <http://ebills.sourceforge.net/> by Mark Asplen-Taylor <mark@asplen.co.uk>,
-licensed under the terms fo the GNU GPL.
+licensed under the terms of the GNU GPL.
 
 <P>
 Contains "JS Calendar" <http://dynarch.com/mishoo/calendar.epl>
 by Mihai Bazon <mishoo@infoiasi.ro> licensed under the terms of the GNU LGPL.
 
 <P>
-Contains FCKeditor by Frederico Caldeira Knabben, licensed under the terms of
+Contains CKeditor by Frederico Caldeira Knabben, licensed under the terms of
 the GNU GPL.
 
 <P>
 Contains XMenu <http://webfx.eae.net/dhtml/xmenu/xmenu.html>
 by Erik Arvidsson, licensed under the terms of the GNU GPL.
 
+
 <!--RT add-ons-->
 
 <P>
@@ -82,6 +89,7 @@ Contains "RTx::Statistics Package"
 Contains "RTx::WebCronTool" <http://search.cpan.org/dist/RTx-WebCronTool/> from
 Audrey Tang, licensed under the same terms as Perl (GPL/Artistic).
 
+
 <!--libraries-->
 
 <P>
@@ -100,6 +108,29 @@ terms of the BSD license.<BR>
 &copy; 2005 modernmethod, inc<BR>
 Perl backend version &copy; 2005 Nathan Schmidt
 
+<P>
+Contains code derived from eps2png by Johan Vromans, licensed under the same
+terms as Perl (GPL/Artistic).
+
+<P>
+Contains code derived from HTML::GoogleMapsV3 by David Peters, licensed under
+the same terms as Perl (GPL/Artistic).
+
+<P>
+Contains the Masked Input JavaScript library by Kendall Conrad, licensed under
+a <a href="http://creativecommons.org/licenses/by-sa/3.0/us/">Creative Commons 
+Attribution-ShareAlike 3.0 United States</a> license.
+
+<P>
+Contains the <a href="http://jquery.com/">jQuery</a> and
+<a href="http://jqueryui.com/">jQuery UI</a> libraries by the jQuery Foundation
+and other contributors, licensed under the terms of the MIT license.
+
+<P>
+Contains the Spectrum No Hassle jQuery Colorpicker by Brian Grinstead, licensed
+under the terms of the MIT license.
+
+
 <!-- artwork -->
 
 <P>
@@ -107,8 +138,16 @@ Contains public domain artwork from openclipart.org by mimooh and other
 authors.
 
 <P>
-Contains icons from <A HREF="famfamfam.com">famfamfam.com</A> by Mark James,
-licensed under the terms of the Creative Commons Attribution 2.5 License.
+Contains icons from
+<A HREF="http://famfamfam.com/" TARGET="_blank">famfamfam.com</A>
+by Mark James, licensed under the terms of the Creative Commons Attribution
+2.5 License.
+
+<P>
+Includes icon from 
+http://www.iconarchive.com/show/oxygen-icons-by-oxygen-icons.org/Actions-document-edit-icon.html
+licensed under GNU Lesser General Public License
+</P>
 
 </BODY>
 </HTML>